Fix cross-compilation, and gcc4.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 5b79d37ff74440600ad2ddf23ce7de6b5ce10fce..4f5f8f80c384ce8a3095d71e82df99ebb162e611 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -7,12 +7,12 @@ XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
 ifeq ($(XEN_TARGET_ARCH),x86_32)
 CFLAGS  += -m32 -march=i686
-LDFLAGS += -m elf_i386
+LDFLAGS += -m32
 endif
 
 ifeq ($(XEN_TARGET_ARCH),x86_64)
 CFLAGS  += -m64
-LDFLAGS += -m elf_x86_64
+LDFLAGS += -m64
 endif
 
 X11_LDPATH = -L/usr/X11R6/$(LIBDIR)

diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile
index a43b7910addb55b687d0887033919965790053c6..17ef50b76b1e90be35315723327ce5145991db67 100644 (file)
--- a/tools/firmware/vmxassist/Makefile
+++ b/tools/firmware/vmxassist/Makefile
@@ -29,16 +29,13 @@ XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc
 #DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
 #XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
 
-LD=ld
-CC=gcc
-CPP=cpp -P
-OBJCOPY=objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
-CFLAGS=${DEFINES} -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
-
-ifeq ($(XEN_COMPILE_ARCH),x86_64)
+LD       = ld
+CC       = gcc
+CPP      = cpp -P
+OBJCOPY  = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
+CFLAGS   = ${DEFINES} -I. $(XENINC) -Wall -fno-builtin -O2 -msoft-float
 CFLAGS  += -m32 -march=i686
-LDFLAGS += -m elf_i386
-endif
+LDFLAGS  = -m elf_i386
 
 OBJECTS = head.o trap.o vm86.o setup.o util.o
 

diff --git a/tools/misc/cpuperf/Makefile b/tools/misc/cpuperf/Makefile
index c33e7d925080fb72f5afcc792ddb48ef4d376ff5..71710bb9fe2181a646c01226b5f9a9ee0f19f6fc 100644 (file)
--- a/tools/misc/cpuperf/Makefile
+++ b/tools/misc/cpuperf/Makefile
@@ -17,8 +17,7 @@ INSTALL_DIR   = $(INSTALL) -d -m0755
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CC           = gcc
-CFLAGS       = -Wall -O3 
+CFLAGS      += -Wall -O3 
 
 HDRS         = $(wildcard *.h)
 SRCS         = $(wildcard *.c)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 494a7f20d3b875a9aeae76de57465ddd0d64f182..517779b7012e0ee1530e75c047033a2a6b4ed001 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -19,11 +19,11 @@ BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
 BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public
 BASECFLAGS+= -I.
 
-CFLAGS += $(BASECFLAGS)
-LDFLAGS=$(PROFILE) -L$(XEN_LIBXC)
-TESTDIR=`pwd`/testsuite/tmp
-TESTFLAGS=-DTESTING
-TESTENV=XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
+CFLAGS  += $(BASECFLAGS)
+LDFLAGS += $(PROFILE) -L$(XEN_LIBXC)
+TESTDIR  = `pwd`/testsuite/tmp
+TESTFLAGS= -DTESTING
+TESTENV  = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR)
 
 all: xen xenstored libxenstore.a libxenstore-pic.a